Added touchscreen support