Updated hooks