New api first draft