Issue #132
Parsing for the last few message types.