Changes to support public publishing