Update in according to Platform API chnages