Adding more metrics closes #58