Add navigation state class, vehicle marker class