Rework to handle documentations as bundles