(#233) Refactor custom facts