Updating schema handler to incorporate relationships. Will fail tests... HARD