Added most of the data structures and methods for retrieving them.