Move to granular Comment document