Updated to latest Web API.

Updated PR with update for latest pieces of Web API.