Fixed NotesService to use new service model