Hall agrees to terms on 7-year extension