(PUP-542) Add structured facts support