Began refactoring options storage