Updating decorator to remove model import.