Controller generator enhancements