improve user and role and organization function