Addint metrics, need to fix title listing