Changed the public API