Simplify auto-updating