Adapt to new generic access parameter concept of the CR