Add decorator and strategy