1. Add national.json data
2. Fix stream memory leak