Add decorator support