Add batch xml
Better job class lifecycle