[TASK] New API design