Updated content type picker and api.