Add additional fallbacks