Refine the Model class for database