Added ServletMapping support