Revamp Message and Consume/Publish classes