Updated the way class relationships are build. Stopped using the target entity resolver.