Updated gem_importer to not query db as much