Update for lifetime changes