Improve file selection