Rename model var to not be user import specific. Add now fields to documents to support type and source.