Enhance agency and address discrimination