Added effects and generator classes