Added IC2 support