Updated public export