Improvements on options system