Improve usage reporting