Decorator support WIP