Added support for magic tracking