Switch to SclZfGenericMapper