[BACKLOG-1498] Refactor Model Annotation Models
[TEST] Fix Test Compile errors
Merge pull request #67 from bytekast/BACKLOG-1498

[BACKLOG-1498] Refactor Model Annotation Models