changed a little the domain objects