added remaining input types