adding automatic mappings generation