Improved usage data layout

Closes #1424