Update according to changes in platform-api