Added better routing specs