Making file selection more flexible