Add option to not create collection