Updates to ORM class, not tested