Small change for data management improvement