Fixed ORM mappings.