Move to json param format