More enhancements to the api