Refactore the classes again to fix neo4j field annotation problem.