Added more support for destinations.