Adding more structs + hooks