Changes to the new Feature type