Some improvements to the send API