Data provider and data converter is added
Fixed the merge conflict