Hammond signs two-year extension