changes for new Core Hierarchy