Add more Enterprise-grade classes