[SNEAKER-33] Design decorator pattern