Attempt to port API changes in IC2