Improve returnType enhancement to include type information from result instance object