Simplify metric storage