Improved Model Classes