More support for multiple input types.