BATCH-2003: Adding initial Collector support
BATCH-2003: Continued work on Collector functionality