Further outputmap refinements