Ability to enable/disable classes
Some build modifications