tweaks to the ORM