Improve performance in cases where we have a single primary key