Some small fixes
Make all datasource thread safe
Small fix
Organize Fares By Route into Builder