User_Master and Job_Master added