updating cypher part to new model
adapting new domain model