Moving more content-types into representations