API fix, ORM fix