DataSources: Better "proxy" design #2 - Added forgotten file  [Issue #27]