New API design finished