Added support for designated stops