Implement datasource
Resolved conflicts