Some progress on #374, listening at the document level maybe need to configure