Re-enabled generic generator
Check for modified vanilla classes