Reworked mappings and changed a few entity properties.