Improve parsing with a new provided file