Some improvements
Add encapsulation support in response