Updated callbacks and code for messages with no body v0.4.0