Add getter gor jobId + refactoring