Chnages required for on-prem