Context-aware column count.
Version bump (2.1)