Refinements on latest improvements for IntermediateExpansion endpoints