Add support for both Content-Type parsing
Updating sample