Cleaned up the ORM. Less magic. More explicit.