Added Fact package
fixed issues