Merged the way entities are mapped and created