[BACKLOG-1498] Refactor. Add utility methods in model annotation definition

let's sit down and look at it Monday.