Added auto_increment check