Tom Smith signs two-year contract extension