Added support for more HttpContent types, plus bug fixes