Updated ASP and CS to use new IC2 Api