Adding escapeshellarg
Refactoring singleton