Removed nested batches
Added isBatch value on batches. Closes #100