Change to Primary Model and View Classes