A few new classes in Model