bundle and map

Signed-off-by: Maxens Dubois <maxens.dubois@gmail.com>