Refined auto updating