Including new input types and adjusting bool conversion