Switch to esty / statsd style storage schema for all data