Integrated with new factbook-core