* Add vtp to command mapping
* Cleaned up imports in SystemCommandExecutor