Auto-resolving unresolved references