wrap: Allow commands as well