Discussion today about decorator subclass in a future PR.