Migrate to CallResolverExtension. Move default extension to the end