Add gen_smtp and other related