updated job and user model