IC2 support added and fixed for core