Added support for non-touch clients