Improving mqtt input event adaptor