Fix Job Type
Add unit tests
Add Nullable annotation
Refactoring Builder process + add unit tests