Added more intelligent fallback options