Added support for more extensible entity types
Added support for more extensible entity types