switched to JSON objects and RawMessage arg type