Adapted Autonavigator to new event system