Re-add support for referring scenarios