Added support for turning off update for better portability