improve annotation DataStructure