Made fields optional