Decorator improvements