Optimizations and options working