Add custom return body support