Added generic input support
Added generic input support