Better feature file and implementation