Added context and servlet
all