Add content type definitions from 'master' branch