Added bundle data source reading and mapping