Added support for specifying the note and unique id