Change a factory method to static
Add map initialization in DataRow
Change unit test