I will improve this later with a `OptionalColumnDecorator`, but i don't think have time to do it now, as we have a release. Usually i use the approach "1st make it work, than make it better, then make it perfect", and this involves more than one iteration (pull request in this case).
Now is certainly far from perfect, but i think it follows the design and uses the existing classes, so its not a 'it barely works' case.
We can pick this up later as a natural design debt/refactoring task. Is this ok for you?