Switch to IC2 api
Fix assets