refactor Class -> class_model