Little adjustment to the API