Major update to framework. The remaining thing is to finish multiple data source configuration implementation and document the code :-(