More changes to revert public API