Removed less important classes from list to reduce code generation work