add internal mappings as well