Updated current API proposal. See Basdem-dev for more details.