Better support for having online mode or not.