Update for latest atom apis