More web service refactoring and doc improvements