Added primary-key-slots and primary-key-column-names