modify broker-service handler