Switched data source map function from dev