Added dispatcher resolver