Fixed entity inheritance