Updated script to include primary keys, auto increments