ADSP - (Fix Patch 0010) Improve database store process