Updated with app and servlet options