LAB-53 Use ORM to manage data mapping