Added support for controlling the updates and more