More robust creation of data access object
p4#: 20410