Adding additional decorator for refactoring options

as previously discussed.