Numerous enhancements and new convenience classes.