Refactored upsert scanlist