[#68231446] refactored code out the the datasources