refactor(resolver, controller): update controller and resolver