[REFACTOR] Optimized progress handling
[REFACTOR] Optimized filenames