Improve speed metrics