Add HSAC mappings in preparation for partial transition