Numerous commits towards ORM Design