adding timing and argument factory settings to data source factory
refactored main bootstrap code