Refactoring and more pointcuts
MetricsProfiler knows about batch metric updates now
Tests for the profiler