Fixed a cyclic dependency with neo4j