Added missing class, extended notebook class