Added decorator pattern
Changes?