Some more work on dynamic input mapping