Adding metrics and comment endpoints