Cleaned up IC2 api