More conversions, domain objects and ORM mapping