Notebook service improvements