CORE preparing for the generic EntityLeaf