diff --git a/src/Commands/CustomTableOrphansCleanupCommand.php b/src/Commands/CustomTableOrphansCleanupCommand.php
index f932e4f..c9dd0ab 100644
--- a/src/Commands/CustomTableOrphansCleanupCommand.php
+++ b/src/Commands/CustomTableOrphansCleanupCommand.php
@@ -53,6 +53,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/ExtractMetadataCommand.php b/src/Commands/ExtractMetadataCommand.php
index 22050b4..7b86ab6 100644
--- a/src/Commands/ExtractMetadataCommand.php
+++ b/src/Commands/ExtractMetadataCommand.php
@@ -53,6 +53,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/FileSystemBenchmarkCommand.php b/src/Commands/FileSystemBenchmarkCommand.php
index c1ddc1f..7bbaae6 100644
--- a/src/Commands/FileSystemBenchmarkCommand.php
+++ b/src/Commands/FileSystemBenchmarkCommand.php
@@ -45,6 +45,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/GenerateMetadataCommand.php b/src/Commands/GenerateMetadataCommand.php
index 62c88e0..cf8cea2 100644
--- a/src/Commands/GenerateMetadataCommand.php
+++ b/src/Commands/GenerateMetadataCommand.php
@@ -49,6 +49,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/LogicHooksUsageCommand.php b/src/Commands/LogicHooksUsageCommand.php
index 4c64267..9b0c3de 100644
--- a/src/Commands/LogicHooksUsageCommand.php
+++ b/src/Commands/LogicHooksUsageCommand.php
@@ -47,6 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/MaintenanceOffCommand.php b/src/Commands/MaintenanceOffCommand.php
index d8f7b09..b1636ab 100644
--- a/src/Commands/MaintenanceOffCommand.php
+++ b/src/Commands/MaintenanceOffCommand.php
@@ -47,6 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/MaintenanceOnCommand.php b/src/Commands/MaintenanceOnCommand.php
index bc60732..ff3930f 100644
--- a/src/Commands/MaintenanceOnCommand.php
+++ b/src/Commands/MaintenanceOnCommand.php
@@ -47,6 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/MassModuleRetrievalCommand.php b/src/Commands/MassModuleRetrievalCommand.php
index 9dd05b0..f285646 100644
--- a/src/Commands/MassModuleRetrievalCommand.php
+++ b/src/Commands/MassModuleRetrievalCommand.php
@@ -46,7 +46,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $filter = $input->getOption('filter');
 
         if (!empty($url) && !empty($user) && !empty($pass) && !empty($module) && !empty($dir) && !empty($limit)) {
-            $logic = new Sugar\Logic\MassRetrieverApi($url, 'base', $user, $pass, $module); 
+            $logic = new Sugar\Logic\MassRetrieverApi($url, 'base', $user, $pass, $module);
             $logic->setLogger($output);
             $output->writeln('Executing retrival of the records for module ' . $module  . ' in chunks of ' . $limit  . ' records, from offset ' . $offset . ' and saving them into ' . $dir . ' ...');
             $output->writeln('Connecting to url ' . $url . '...');
@@ -55,6 +55,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $output->writeln('Please make sure all required parameters are passed correctly to the command. Check with --help for the correct syntax');
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/MySQLOptimizeCommand.php b/src/Commands/MySQLOptimizeCommand.php
index 05c4c78..e9d7ed7 100644
--- a/src/Commands/MySQLOptimizeCommand.php
+++ b/src/Commands/MySQLOptimizeCommand.php
@@ -47,6 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/MySQLOptimizeWithIndexManipulationCommand.php b/src/Commands/MySQLOptimizeWithIndexManipulationCommand.php
index d8f67d0..09163e0 100644
--- a/src/Commands/MySQLOptimizeWithIndexManipulationCommand.php
+++ b/src/Commands/MySQLOptimizeWithIndexManipulationCommand.php
@@ -54,6 +54,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/RBVUsageCommand.php b/src/Commands/RBVUsageCommand.php
index e4cb414..e353c1e 100644
--- a/src/Commands/RBVUsageCommand.php
+++ b/src/Commands/RBVUsageCommand.php
@@ -47,6 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/RecordCountCommand.php b/src/Commands/RecordCountCommand.php
index fee1589..0c3e861 100644
--- a/src/Commands/RecordCountCommand.php
+++ b/src/Commands/RecordCountCommand.php
@@ -47,6 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/RepairCommand.php b/src/Commands/RepairCommand.php
index f4fd11d..29331db 100644
--- a/src/Commands/RepairCommand.php
+++ b/src/Commands/RepairCommand.php
@@ -47,6 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/RepairMissingTablesCommand.php b/src/Commands/RepairMissingTablesCommand.php
index f8323c0..bf5b9e3 100644
--- a/src/Commands/RepairMissingTablesCommand.php
+++ b/src/Commands/RepairMissingTablesCommand.php
@@ -52,6 +52,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/RestoreRecordCommand.php b/src/Commands/RestoreRecordCommand.php
index 327435d..e12499e 100644
--- a/src/Commands/RestoreRecordCommand.php
+++ b/src/Commands/RestoreRecordCommand.php
@@ -55,6 +55,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/SugarBPMAnalysisCommand.php b/src/Commands/SugarBPMAnalysisCommand.php
index 0826ee7..700d8b2 100644
--- a/src/Commands/SugarBPMAnalysisCommand.php
+++ b/src/Commands/SugarBPMAnalysisCommand.php
@@ -49,6 +49,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/SugarBPMFlowCleanupCommand.php b/src/Commands/SugarBPMFlowCleanupCommand.php
index 8b62312..d82eac2 100644
--- a/src/Commands/SugarBPMFlowCleanupCommand.php
+++ b/src/Commands/SugarBPMFlowCleanupCommand.php
@@ -55,6 +55,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/SugarFormulasUsageCommand.php b/src/Commands/SugarFormulasUsageCommand.php
index ccf02c9..6d3fb22 100644
--- a/src/Commands/SugarFormulasUsageCommand.php
+++ b/src/Commands/SugarFormulasUsageCommand.php
@@ -49,6 +49,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($instance . ' does not contain a valid Sugar installation. Aborting...');
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Commands/TeamSetCleanupCommand.php b/src/Commands/TeamSetCleanupCommand.php
index 3484659..99a1e5c 100644
--- a/src/Commands/TeamSetCleanupCommand.php
+++ b/src/Commands/TeamSetCleanupCommand.php
@@ -53,6 +53,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }
         }
-        return 1;
+        return Command::SUCCESS;
     }
 }