Fixed entity hierarchy.