fleshed-out document id annotations and support