Updated Web Client to work with proposed changes