Some changes to allow editing for the different kinds of features.