Adapt according to needs of first actual implementation (CR)