Made changes into metrics collection process