Added extra servlets and other features for 2.0 deploy