Added support for a bunch of new figures
get_aggregated_datasets() now returns a dict as it was supposed to