Updated to work with newest version of WebAPI