Add Decorator pattern