Core entity redesign