Added a decorator pattern.