Updated to use new SclZfGenericMapper module
Updated to use new SclZfGenericMapper module