No more Decorator