Add license ; Refactor output of Measures