Added more input classes