Callable Resolver addition, needs appropriate tests