Updates for atom impl