Updated action hooks