Updated Routes and model relationships