doc and mapping update