Changes related to content-view-definition