Added generic resolver.