Follow alf-core changes (hierarchize)