Added output mapping parameters