Model updated with annotations