Some refactoring
More metrics