Full parity with Java API