Adding support for unique keys, muti-column primary key