Wes Johnson agrees to contact extension