Modified map command to optionally include inputs.