added where & orWhere clauses to ORM