Restructured to make it easy to add new web service calls