Fixed model entities with collection