Added servlet support