added missing data structures