Added settings to override store and update