Add support form custom primary keys