Added distance tracking to models