Changed Surabaya in order to be able to handle two Versions of the Servlets