Message queue: handler now takes map arg for better extensibility
Message queue: handler now returns map arg for better extensibility