Updated bundle
Removed data mapper setup