Implemented second web service
Refactored to simplify base classes