Support for more input types