Added smart updating option