Two more changes regarding schemeType