Features/add metrics