Add initial work for metrics collection