Fixed threading and added some new metric objects