Align with alf-core