DNN-3623 - options refactoring