Adding in necessary data structures