Add _folder_ and _all_ integration modes
Make integration feel more robust