Add optional mapping type support.