Update after confilct in EntityModel and a few more fixes