Adding support for multiple entity types in a single context