Fix methods after changes in ORM