Update for latest versions