Added metric container to simplify metrics.