Move fact to own module