Re-factored servlets.