Added support for highways