We used the ORM to declare the table structure, but just performed raw queries. As a step to adding more tables and more complex relationships, fully utilize the ORM in queries. Change-Id: I260095d908dc9bea03cf825f4cc8aae8ae43ba16