Added subscriber generator and dependent code