Adding CEX Support back in