Optimized scanner and ensure all necessary data is included.