New API and POJOs

New API and POJOs