Improvements to the API syntax