messagebus modifications