Re-added EncodedMessage class