First commit of the second version of the ORM