Updates for cfx