Refactored JobContaner etc