Update handler with retention policy stuff