Service bus changes - in progress