DCSL customizations v2