Move history observer here