Merge "Refactor the DataUsageBase"