Added partial mappings for ibug -> did