Fixed class model not being universal
Audit cleaned up