Added more input types