Decorator Pattern Added