better support for session loading