edits for broker api 2.4