Add custom facts
Clean up facts and structure
Validate and add comments