Restructure sessions to save on response finished