Change routes syntax and logical