Add better support for v1/v2 models and fix issue with trackstick detection