Extended the examples and make it more sane for servlets