Small changes for more consistency in data management