Final fix for data structs