Updated external mappings and several elements.