Add support for primary columns