Remove NOT NULL for primary keys and add comment