Class model improvements