Added metrics (Issue #50)