Update #43 add resolve users and prepare to resolve tasks/jobs