Update SGPstateData to WA changes
Merge pull request #661 from adamvi/master

Update SGPstateData to WA changes