Core DLCODESTORM changes