Fixed identification and mapping issues