Update for latest nightly interface