Modules: Command Terminal Refactoring

We might need to add more data from terminal commands