Got new ID resolver working