Further changes for small ORM