combined global models with endpoint entities

Global models override entities defined with an endpoint. I think it's preferable to combine these models.