Realign schema with latest 149 migration script
If we really want to make those not null, please let's make another migration script.