Different Content Type support. Fix #2.