Added IPC commands
Refactoring