Refactoring. Making options classes as managed.