Refactored decorators (closes #1029)