Improve handling multitouch using new API