Updated: Routes and Controllers