Modifications for Diamond scheme support
Modifications for Diamond scheme support