More config option optimizations