Fixed setup.h to include fact-set queries