Extensions and mapping update