Upgraded to servlet 3.0