Refactroing of NeoAssociationResolver.