More historical session loading work