Minor adjustment to the API