Update the decortor pattern implementation