Update to the new IC2 API