Added InpuHandler support