Few more changes for batch stuff