Merge "Remove singleton pattern in base_generator"