Changed primary keys to auto-increment