Added support for notes