update schema annotations - WIP