Added input mapper