SOC-4401 | Improves the implementation the data changes and fix UT failed.