Added more robustness, file filters for advanced