Added multi-touch support