More scheme updates