Ported in logic to generate simplified content type, and also now stored extended content type.