General adjustments in feature file