improved pattern for AD by role