Now entities are updated correctly