REFACTORING and FIX Jenkins Build Failure