Make the API more explicit