Feature/more metrics