Draft of updated API