Align with alf core.