CLC-3517 Return a hash instead of JSON string