UPDATE: better handling of Notes

Added fields