Updated Web Service with Bug fixes