changes for support dispatcher