Improve updatetime behavior