change to this wrapper class to ensure all bundle fields are copied
over in order necessary from the format