Improved handling of columns

This is already implemented as optional columns