Added detection of AWS Device Mappings