Uodated to 1.7.4 (and removed Metrics)