Added support for decorators and moved faux 'extensions' to decorators instead