API Upgraded module to use new database ORM