Improved usage collection data and format