close #23 - remove short versions of the domain model and pass the responsability to controller