Added remaining user-needed fields (and then some)