Added autoincrement where needed