Merge "Add read bandwidth and small refactor."