[schema] fix schema [in-progress]