Add support for creating primary/unique keys