Update for new versions