Added destination manager support