Update with newer ORM wrapper