Update the store to include the new fields

Also renamed the subjectId field back to subject_id to avoid confusion