Feature/content type changes