WebService module refactored