Improve Batch message log
WIP