Start adding support for clustering primary key