Improved file selection