Some Job and DB changes