Code changes according to web service api