Added support for primary key checks.