Update in according to Platform API changes