Align to CAF changes