Update for work with current Nightly