Added support for more input types