Adding features to batch.py