Support for latest platform changes