Added more data structure stuff