Finished mapping the relations