Changed Decorator to Component