Change the API around