Made some fields optional