True. I think this might be better addressed by doing the mappings inside the AD response handler class. I'll account for this in the next commit.