After refactoring option class