Added Decorator feature.