Schema Output Resolver improvement