Add initial version of separate handler of data sources