Enhance decoration class