Add bundler and guard support
Refactor spec code
Add concatenating and flattening to Enumerators