Added decorator support