Implemented switch to enable/disable decorate