[Added] Decorator 2 || TIJ 598