Working on the public API