Move ORM part out of model, make it a real thin model