Get rid of reflection related-code for the Adapter, Mapping and Storage part of the bundle