Update for latest version meeting dependencies