Made the ORM a bit more pythonic