ORM hook tweaks