Batch files improvements