Got some bugs after Model to ORM change...