Add bundles
Try to fix issues