Fixes #6864 - adding api messages for extraction