Finished the ORM Framework