Moved creating empty job to Job class