Integrated the early version of the ORM from v0.4