Added support for note