adding uncommited changes mainly to ORM