Fixing bug with POST data not working quite right
Adding the service code for the main scenarios