More generator enhancements