Added class element decorator support