Added several metrics