Changed Class model a bit