Add DataAccess override for 2.1 compatibility