Issue #6 - More ORM work