Added Notebook Support