[BACKLOG-1498] Refactor Model Annotation Models