Changes for new Core Hierarchy