Decorator pattern was added