Fix typo in model, also annotate