add primary key support to utils - passing test