Move to JSON api for OFDP