Updated content types to allow comparison of types