Changes for consistency with app2