Add ability to set custom primary keys