Updated feature and core-criteria.