Tie in more structs