Optimize PRIMARY KEY functionality a bit