Preserve public API