Added auto-increment keys