Add C1 support