Revise annotation model

Unnecessary properties deleted