Add decorator and delegation