Make these cols nullable for now, then drop them if really not needed