Added support for notes and notesurl