Added support for touch tracking