Added support for touch devices