Add scripter class
Refactoring