Adding Decorator pattern