Add DataMapper & Decorator