Api update

Based on email proposal.