Adding support for different input types