Cleaned up ORM base class