Updated class structure to us Decorator