BA refactored + Job refacored