Streamlined and corrected issues with weight labeled generators