Improved file selection support