Added some decorator pattern support.