Fix top-level API