#265. Making the fields nullable for now.