Added metrics for #14