Added support for destination tags