Replaced programmatic servlet configuration with web.xml file