Add mappings for GAD