Updates to use annotations for assigning item attributes to facilitate
code maintainability