Revise message parsing to pass raw JSON