Unifying the API once more