Improved Decorator pattern example