Updated to use new SclZfGenericMapper module