Shaw signs new deal with Man City