Glassware 2.0 Support