refactor web-service addHeaders() call into web-service class