Simplify taxonomy
Improve Fact
Merge with master