Tidy up aliases syntax and add routing option