Improved behavior for natural primary keys