Added support for entity inheritance