Remade resolver to clear fallback and using it coupling with AggragateResolver