Make type optional in BATCH-3.2