Update for latest base runtime