Enhancements to web api