added decorator feature.