Update mechanism simplification