Fix CLS compliance in Model and Database