Added simple message parsing