Miscellaneous updates. Working towards ORM