#163 Initial support for decorators