Refactored commandHandler + creating exporter command