Adjustments to the API