Decorator updated