Usage data layout tweaks