REF/ENH: Changes for notebook loading