Make ContentType into an actual class