Modifications for Diamond scheme support