Updated public views