Enhancements and options