Made fields nullable