Refactoring and improvements
Refactorings and improvements
Add batch executing