improving servlet support