Started the servlet side implementation of Issue #25