Add DataMapper support