replacing old domain model by a nicer one