Make it work with ORM 2.4