[Diveling annotation layer] Support