Made some of the data structure classes