Enhancements to the API