Added name resolution fallback