Keep the same public API