Improving keying and type mapping.