add more bundle and change mapping