Improved performance for long lists of options