Added support for user-specific annotation of entries.