Altering data collection functions

to reflect session interface.