Steps towards C1 support