Added smtp and removed deprecated feature file