Update SGPstateData to WA changes