Updated Decorator