Refactoring: Use DataSource instead of ConnectionMaker