added more input types