Fix bootstrap
Create collection if not already exist (shim)