Add EntityType in wrong place