Add package structs