Changing the entities back to using relative relationships