Add current API and tests.