Adds metric logging for some more stuff