Refactored options, and options dependencies