Added support for notes and tags.