Move getFieldsToStore to own method in NameTableStore