Added generator for subscriber