Sorted out ContentType so that it doesn't look ugly in Json, and is
simpler as well.
Added missing class.